[IA64] fix noreboot option

fix machine_hlt to support noreboot option.

Signed-off-by: Akio Takebe <takebe_akio@jp.fujitsu.com>
[modified to use existing cpu_halt() function in linux-xen files]
Signed-off-by: Alex Williamson <alex.williamson@hp.com>

diff --git a/xen/arch/ia64/linux-xen/process-linux-xen.c b/xen/arch/ia64/linux-xen/process-linux-xen.c
index aaaaaca0fe3e80a9802fc1a3f00cdad863e48bd1..5f04985cf97ab410e1992fa8e250154661a3da9a 100644 (file)
--- a/xen/arch/ia64/linux-xen/process-linux-xen.c
+++ b/xen/arch/ia64/linux-xen/process-linux-xen.c
@@ -810,6 +810,7 @@ get_wchan (struct task_struct *p)
        } while (count++ < 16);
        return 0;
 }
+#endif // !XEN
 
 void
 cpu_halt (void)
@@ -834,6 +835,7 @@ cpu_halt (void)
                ia64_pal_halt(min_power_state);
 }
 
+#ifndef XEN
 void
 machine_restart (char *restart_cmd)
 {

diff --git a/xen/arch/ia64/xen/domain.c b/xen/arch/ia64/xen/domain.c
index 5eca64e9a3683460d477135f76a17d27ca4aaae0..0fadeffad0fbc8a6404978c85ad0f7fa2c368a12 100644 (file)
--- a/xen/arch/ia64/xen/domain.c
+++ b/xen/arch/ia64/xen/domain.c
@@ -1123,13 +1123,15 @@ void machine_restart(char * __unused)
        while(1);
 }
 
+extern void cpu_halt(void);
+
 void machine_halt(void)
 {
        console_start_sync();
        if (running_on_sim)
                printf ("machine_halt called.  spinning...\n");
        else
-               (*efi.reset_system)(EFI_RESET_SHUTDOWN,0,0,NULL);
+               cpu_halt();
        while(1);
 }